Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 23:43:15 +0000 (23:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 12 Jan 2010 23:43:15 +0000 (23:43 +0000)

Trivial merge